Skip to content

Import the maybenot machines file in the project#6602

Merged
buggmagnet merged 3 commits intomainfrom
update-the-wireguard-go-branch-to-use-daita-ios-793
Aug 13, 2024
Merged

Import the maybenot machines file in the project#6602
buggmagnet merged 3 commits intomainfrom
update-the-wireguard-go-branch-to-use-daita-ios-793

Conversation

@buggmagnet
Copy link
Copy Markdown
Contributor

@buggmagnet buggmagnet commented Aug 12, 2024

This PR does two things :

  • Import the maybenot_machines file that is required to use Daita, it will eventually be passed to the settings generator
  • Change the wireguard-go commit to point at the latest commit of the mullvad-master branch of our fork of wireguard-apple which adds Daita APIs in wireguard-go.

This change is Reviewable

@buggmagnet buggmagnet added the iOS Issues related to iOS label Aug 12, 2024
@buggmagnet buggmagnet self-assigned this Aug 12, 2024
@linear
Copy link
Copy Markdown

linear Bot commented Aug 12, 2024

@buggmagnet buggmagnet force-pushed the update-the-wireguard-go-branch-to-use-daita-ios-793 branch 2 times, most recently from 54f0b1c to 51c0ce3 Compare August 12, 2024 13:05
Copy link
Copy Markdown
Contributor

@acb-mv acb-mv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Copy Markdown
Contributor

@rablador rablador left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 4 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@buggmagnet buggmagnet force-pushed the update-the-wireguard-go-branch-to-use-daita-ios-793 branch from ff5e5e3 to fd4751c Compare August 13, 2024 13:26
@buggmagnet buggmagnet force-pushed the update-the-wireguard-go-branch-to-use-daita-ios-793 branch from fd4751c to 3a3a0ce Compare August 13, 2024 13:28
@buggmagnet buggmagnet merged commit ca47b02 into main Aug 13, 2024
@buggmagnet buggmagnet deleted the update-the-wireguard-go-branch-to-use-daita-ios-793 branch August 13, 2024 13:33
@github-actions
Copy link
Copy Markdown

🚨 End to end tests failed. Please check the failed workflow run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

iOS Issues related to iOS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants